* (bug 3216) Don't show empty warning page when no warnings.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index d3d1ab0..05aa2fd 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -41,6 +41,8 @@ Misc work going on.....
 * Edit conflict on recreation of deleted page
 * (bug 3210) Fix Media: links with remote image URL path
 * (bug 1956) Hide bot uploads from Special:Newimages
+* (bug 3216) Don't show empty warning page when no warnings.
+
 
 === Caveats ===
 

diff --git a/includes/SpecialUpload.php b/includes/SpecialUpload.php
index e8f371e..40ab946 100644 (file)
--- a/includes/SpecialUpload.php
+++ b/includes/SpecialUpload.php
@@ -220,7 +220,7 @@ class UploadForm {
                 * Check for non-fatal conditions
                 */
                if ( ! $this->mIgnoreWarning ) {
-                       $warning = '<ul>';
+                       $warning = '';
                        if( $this->mUploadSaveName != ucfirst( $filtered ) ) {
                                $warning .=  '<li>'.wfMsgHtml( 'badfilename', htmlspecialchars( $this->mUploadSaveName ) ).'</li>';
                        }
@@ -254,7 +254,7 @@ class UploadForm {
                                 * Stash the file in a temporary location; the user can choose
                                 * to let it through and we'll complete the upload then.
                                 */
-                               return $this->uploadWarning($warning . "</ul>");
+                               return $this->uploadWarning( $warning );
                        }
                }